Auto merge of #3671 - z1mvader:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 9 Feb 2017 01:22:51 +0000 (01:22 +0000)
committerbors <bors@rust-lang.org>
Thu, 9 Feb 2017 01:22:51 +0000 (01:22 +0000)
commitc5679e21ef8c7deabce3911ce04ead338ff063be
tree08ae621350df19d632c9ed9d6de015258f19b3e3
parent4036172ae775c9e62f75c175d7e278d4a759c39e
parentfb6a98fbd682bd074198d080da894f64399f9018
Auto merge of #3671 - z1mvader:master, r=alexcrichton

trying to fix unimplemented flock under linux

It fixes https://github.com/rust-lang/cargo/issues/3666